From 0836f33ae79426750fcf44a5bd4440b0f8801777 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Wed, 16 Mar 2022 20:22:03 -0500 Subject: [PATCH] Delete saroute for nonuse. --- CMakeLists.txt | 1 - GPSBabel.pro | 1 - saroute.cc => deprecated/saroute.cc | 0 reference/format0.txt | 1 - reference/format1.txt | 1 - reference/format2.txt | 1 - reference/format3.txt | 12 ------------ reference/help.txt | 6 ------ testo.d/saroute.test | 9 --------- vecs.cc | 9 --------- xmldoc/formats/saroute.xml | 9 --------- 11 files changed, 50 deletions(-) rename saroute.cc => deprecated/saroute.cc (100%) delete mode 100644 testo.d/saroute.test delete mode 100644 xmldoc/formats/saroute.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index a3d507614..42973a4bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,7 +133,6 @@ set(ALL_FMTS ${MINIMAL_FMTS} qstarz_bl_1000.cc random.cc raymarine.cc - saroute.cc sbn.cc sbp.cc shape.cc diff --git a/GPSBabel.pro b/GPSBabel.pro index 7b3db4668..dbe4cb094 100644 --- a/GPSBabel.pro +++ b/GPSBabel.pro @@ -108,7 +108,6 @@ ALL_FMTS = $$MINIMAL_FMTS \ qstarz_bl_1000.cc \ random.cc \ raymarine.cc \ - saroute.cc \ sbn.cc \ sbp.cc \ shape.cc \ diff --git a/saroute.cc b/deprecated/saroute.cc similarity index 100% rename from saroute.cc rename to deprecated/saroute.cc diff --git a/reference/format0.txt b/reference/format0.txt index e87ab3a7c..358f68b9e 100644 --- a/reference/format0.txt +++ b/reference/format0.txt @@ -6,7 +6,6 @@ iblue747 csv Data Logger iBlue747 csv iblue757 csv Data Logger iBlue757 csv gpl gpl DeLorme GPL saplus DeLorme Street Atlas Plus -saroute anr DeLorme Street Atlas Route destinator_itn dat Destinator Itineraries (.dat) destinator_poi dat Destinator Points of Interest (.dat) destinator_trl dat Destinator TrackLogs (.dat) diff --git a/reference/format1.txt b/reference/format1.txt index b041fb548..eff0629bb 100644 --- a/reference/format1.txt +++ b/reference/format1.txt @@ -9,7 +9,6 @@ file iblue747 csv Data Logger iBlue747 csv file iblue757 csv Data Logger iBlue757 csv file gpl gpl DeLorme GPL file saplus DeLorme Street Atlas Plus -file saroute anr DeLorme Street Atlas Route file destinator_itn dat Destinator Itineraries (.dat) file destinator_poi dat Destinator Points of Interest (.dat) file destinator_trl dat Destinator TrackLogs (.dat) diff --git a/reference/format2.txt b/reference/format2.txt index 4d37d6469..79de41b50 100644 --- a/reference/format2.txt +++ b/reference/format2.txt @@ -9,7 +9,6 @@ file --rw-- iblue747 csv Data Logger iBlue747 csv file --rw-- iblue757 csv Data Logger iBlue757 csv file --rw-- gpl gpl DeLorme GPL file rw---- saplus DeLorme Street Atlas Plus -file --r--- saroute anr DeLorme Street Atlas Route file ----rw destinator_itn dat Destinator Itineraries (.dat) file rw---- destinator_poi dat Destinator Points of Interest (.dat) file --rw-- destinator_trl dat Destinator TrackLogs (.dat) diff --git a/reference/format3.txt b/reference/format3.txt index 37282d434..56a2c2738 100644 --- a/reference/format3.txt +++ b/reference/format3.txt @@ -134,18 +134,6 @@ option saplus prefer_shortnames Use shortname instead of description boolean option saplus datum GPS datum (def. WGS 84) string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_datum -file --r--- saroute anr DeLorme Street Atlas Route saroute - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html -option saroute turns_important Keep turns if simplify filter is used boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_turns_important - -option saroute turns_only Only read turns; skip all other points boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_turns_only - -option saroute split Split into multiple routes at turns boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_split - -option saroute controls Read control points as waypoint/route/none string none https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_controls - -option saroute times Synthesize track times boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_times - file ----rw destinator_itn dat Destinator Itineraries (.dat) destinator_itn https://www.gpsbabel.org/WEB_DOC_DIR/fmt_destinator_itn.html file rw---- destinator_poi dat Destinator Points of Interest (.dat) destinator_poi diff --git a/reference/help.txt b/reference/help.txt index 82ad34032..9cf3fe02e 100644 --- a/reference/help.txt +++ b/reference/help.txt @@ -75,12 +75,6 @@ File Types (-i and -o options): urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) - saroute DeLorme Street Atlas Route - turns_important (0/1) Keep turns if simplify filter is used - turns_only (0/1) Only read turns; skip all other points - split (0/1) Split into multiple routes at turns - controls Read control points as waypoint/route/none - times (0/1) Synthesize track times destinator_itn Destinator Itineraries (.dat) destinator_poi Destinator Points of Interest (.dat) destinator_trl Destinator TrackLogs (.dat) diff --git a/testo.d/saroute.test b/testo.d/saroute.test deleted file mode 100644 index a0f1961fc..000000000 --- a/testo.d/saroute.test +++ /dev/null @@ -1,9 +0,0 @@ - -# -# saroute covers *.anr, *.rte, and *.rtd, but I only have an .anr for testing. -# Unfortunately for us, this is a read-only format for now. -# -gpsbabel -t -i saroute -f ${REFERENCE}/track/i65.anr -o gpx -F ${TMPDIR}/gpl1.gpx -gpsbabel -t -i gpx -f ${REFERENCE}/track/i65.anr.gpx -o gpx -F ${TMPDIR}/gpl2.gpx -compare ${TMPDIR}/gpl1.gpx ${TMPDIR}/gpl2.gpx - diff --git a/vecs.cc b/vecs.cc index 580df7228..c4efb0df6 100644 --- a/vecs.cc +++ b/vecs.cc @@ -89,7 +89,6 @@ extern ff_vecs_t tpg_vecs; extern ff_vecs_t tpo2_vecs; extern ff_vecs_t tpo3_vecs; extern ff_vecs_t easygps_vecs; -extern ff_vecs_t saroute_vecs; extern ff_vecs_t gpl_vecs; extern ff_vecs_t igc_vecs; extern ff_vecs_t brauniger_iq_vecs; @@ -171,7 +170,6 @@ struct Vecs::Impl LegacyFormat tpo2_fmt {tpo2_vecs}; LegacyFormat tpo3_fmt {tpo3_vecs}; LegacyFormat easygps_fmt {easygps_vecs}; - LegacyFormat saroute_fmt {saroute_vecs}; #if SHAPELIB_ENABLED ShapeFormat shape_fmt; #endif @@ -380,13 +378,6 @@ struct Vecs::Impl "loc", nullptr, }, - { - &saroute_fmt, - "saroute", - "DeLorme Street Atlas Route", - "anr", - nullptr, - }, #if SHAPELIB_ENABLED { &shape_fmt, diff --git a/xmldoc/formats/saroute.xml b/xmldoc/formats/saroute.xml deleted file mode 100644 index a285a46cc..000000000 --- a/xmldoc/formats/saroute.xml +++ /dev/null @@ -1,9 +0,0 @@ - -This format reads route files from many DeLorme mapping products. -It supports the anr, rte, and rtd formats as either tracks or -routes. - All options only apply to route files from newer (anr) -versions of DeLorme software; older versions didn't store the turn -information with the route. - - -- 2.30.2